Skip to content

[flang-rt] Use correct flang-rt build for flang-rt unit tests on Windows #152318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 7, 2025

Conversation

DavidTruby
Copy link
Member

Currrently flang-rt assumes that LLVM was always built with the dynamic MSVC runtime. This may not be the case, if the user has specified a different runtime with -DCMAKE_MSVC_RUNTIME_LIBRARY. Since this flag is implied by -DLLVM_ENABLE_RPMALLOC=On, which is used by the Windows release script, this is causing that script to fail.

Fixes #151920

Currrently flang-rt assumes that LLVM was always built with the
dynamic MSVC runtime. This may not be the case, if the user has
specified a different runtime with -DCMAKE_MSVC_RUNTIME_LIBRARY.
Since this flag is implied by -DLLVM_ENABLE_RPMALLOC=On, which is used
by the Windows release script, this is causing that script to fail.

Fixes llvm#151920
Copy link
Member

@Meinersbur Meinersbur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you

@github-project-automation github-project-automation bot moved this from Needs Triage to Needs Merge in LLVM Release Status Aug 6, 2025
@DavidTruby DavidTruby merged commit f73a302 into llvm:main Aug 7, 2025
9 checks passed
@github-project-automation github-project-automation bot moved this from Needs Merge to Done in LLVM Release Status Aug 7, 2025
@DavidTruby DavidTruby deleted the flang-rt-winrt branch August 7, 2025 12:09
@DavidTruby
Copy link
Member Author

/cherry-pick f73a302

@llvm llvm deleted a comment from llvmbot Aug 7, 2025
@llvmbot
Copy link
Member

llvmbot commented Aug 7, 2025

/pull-request #152493

tru pushed a commit to llvmbot/llvm-project that referenced this pull request Aug 8, 2025
…ows (llvm#152318)

Currrently flang-rt assumes that LLVM was always built with the dynamic
MSVC runtime. This may not be the case, if the user has specified a
different runtime with -DCMAKE_MSVC_RUNTIME_LIBRARY. Since this flag is
implied by -DLLVM_ENABLE_RPMALLOC=On, which is used by the Windows
release script, this is causing that script to fail.

Fixes llvm#151920

(cherry picked from commit f73a302)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

ninja check-flang-rt is broken on LLVM 21 Windows Release
3 participants